Skip to content

Streamline makefile and makefile.docker #1416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
avivajpeyi merged 2 commits into from
Aug 20, 2025
Merged

Streamline makefile and makefile.docker #1416

avivajpeyi merged 2 commits into from
Aug 20, 2025

Conversation

@avivajpeyi
Copy link
Collaborator

@avivajpeyi avivajpeyi commented Aug 7, 2025

Makefile and Makefile.docker both mostly have the same code.

This PR merges the two files into one.

@avivajpeyi
Copy link
Collaborator Author

avivajpeyi commented Aug 7, 2025

i think this should work?... @jeffriley ?

Screenshot from 2025-08-07 16-08-09

@avivajpeyi avivajpeyi marked this pull request as ready for review August 7, 2025 04:09
@avivajpeyi avivajpeyi mentioned this pull request Aug 7, 2025
Closed
@jeffriley
Copy link
Collaborator

jeffriley commented Aug 7, 2025

Thanks Avi. I'll get rid of that warning in BaseBinaryStar.cpp in my next commit - it just needs braces around the body (single line), or the single line body brought onto the same line as the condition - some sort of weird compiler check.

jeffriley
jeffriley approved these changes Aug 7, 2025
View reviewed changes
Copy link
Collaborator

@jeffriley jeffriley left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good - thanks Avi! I've approved, but you need to resolve the conflicts!

@ilyamandel
Copy link
Collaborator

ilyamandel commented Aug 7, 2025

@avivajpeyi -- thank you. Github claims there is a conflict; could you please resolve?

@avivajpeyi
Copy link
Collaborator Author

avivajpeyi commented Aug 19, 2025

@jeffriley -- fixed merge conflicts

@avivajpeyi avivajpeyi merged commit f0ab925 into dev Aug 20, 2025
2 checks passed
@avivajpeyi avivajpeyi deleted the cleaning_up_makefile branch August 20, 2025 03:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jeffriley jeffriley jeffriley approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@avivajpeyi @jeffriley @ilyamandel